From 43e546b7cbe3ee7e82cbcdcfbbab699ab7d240d7 Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 9 Mar 2009 00:14:29 +0000 Subject: [PATCH] Honor -Sn if comments were present. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3632 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/garmin.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c index c62e465e2..87eb851d2 100644 --- a/gpsbabel/garmin.c +++ b/gpsbabel/garmin.c @@ -848,7 +848,9 @@ waypoint_write(void) way[i]->ident[sizeof(way[i]->ident)-1] = 0; // If we were explictly given a comment from GPX, use that. - if (wpt->description) { + // This logic really is horrible and needs to be untangled. + if (wpt->description && + global_opts.smart_names && !wpt->gc_data->diff) { memcpy(way[i]->cmnt, wpt->description, strlen(wpt->description)); } else { if (global_opts.smart_names && -- 2.30.2